server,engine-schema: add check for account userdata cleanup #11595

shwstppr · 2025-09-08T04:13:37Z

Description

Fixes #9477

This PR add a check for userdata linked with templates not owned by the account during account cleanup

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
build/CI
test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

codecov · 2025-09-08T04:23:16Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 16.24%. Comparing base (750290b) to head (f384872).

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #11595   +/-   ##
=========================================
  Coverage     16.23%   16.24%           
- Complexity    13378    13386    +8     
=========================================
  Files          5657     5657           
  Lines        498932   498967   +35     
  Branches      60552    60554    +2     
=========================================
+ Hits          81016    81063   +47     
+ Misses       408882   408869   -13     
- Partials       9034     9035    +1

Flag	Coverage Δ
uitests	`4.00% <ø> (ø)`
unittests	`17.10% <100.00%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

engine/schema/src/main/java/com/cloud/user/dao/UserDataDaoImpl.java

shwstppr · 2025-09-09T13:48:58Z

@blueorangutan package

blueorangutan · 2025-09-09T13:50:04Z

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-09-09T15:20:53Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 14922

harikrishna-patnala

@shwstppr I believe this fix will not effect the VMs that are already created using the template which previously linked to the userdata as we are saving the actual userdata in user_vm table. am I right ?

github-actions · 2025-09-11T11:27:10Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

shwstppr · 2025-09-11T14:40:12Z

@harikrishna-patnala I'm not sure if we save all user data in user_vm table.
This change is draft as I've not verified myself yet. It may not be needed now that we don't completely remove the userdata entry and just mark it removed

@shwstppr I believe this fix will not effect the VMs that are already created using the template which previously linked to the userdata as we are saving the actual userdata in user_vm table. am I right ?

Fixes apache#9477 Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr · 2025-11-20T09:20:03Z

@blueorangutan package

blueorangutan · 2025-11-20T09:22:03Z

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-11-20T10:45:30Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 15799

shwstppr · 2026-01-07T08:07:11Z

@harikrishna-patnala #9477 was still valid so I updated changes here to prevent account deletion when a userdata owned by the account is linked templates not owned by the account

Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr · 2026-01-07T09:30:16Z

@blueorangutan package

blueorangutan · 2026-01-07T09:32:04Z

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-01-07T10:47:51Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16287

sureshanaparti · 2026-01-08T09:07:47Z

engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java

    }
+
+    @Override
+    public List<Long> listByUserdataIdsNotAccount(List<Long> userdataIds, long accountId) {


Suggested change

public List<Long> listByUserdataIdsNotAccount(List<Long> userdataIds, long accountId) {

public List<Long> listByUserdataIdsNotInAccount(List<Long> userdataIds, long accountId) {

or listByUserdataIdsNotBelongToAccount

sureshanaparti

minor nit, clgtm

boring-cyborg bot added the component:storage label Sep 8, 2025

shwstppr force-pushed the acc-userdata-unlink branch from 3c7e877 to b54406e Compare September 8, 2025 04:14

harikrishna-patnala added this to the 4.22.0 milestone Sep 8, 2025

harikrishna-patnala added this to Apache CloudStack 4.22.0 Sep 8, 2025

harikrishna-patnala moved this to In Progress in Apache CloudStack 4.22.0 Sep 8, 2025

shwstppr commented Sep 9, 2025

View reviewed changes

engine/schema/src/main/java/com/cloud/user/dao/UserDataDaoImpl.java Outdated Show resolved Hide resolved

shwstppr force-pushed the acc-userdata-unlink branch from 7acde42 to 3a31c16 Compare September 9, 2025 10:17

harikrishna-patnala reviewed Sep 10, 2025

View reviewed changes

github-actions bot added the status:has-conflicts label Sep 11, 2025

harikrishna-patnala modified the milestones: 4.22.0, 4.22.1 Nov 12, 2025

harikrishna-patnala removed this from Apache CloudStack 4.22.0 Nov 12, 2025

server,engine-schema: add check for account userdata cleanup

869ffad

Fixes apache#9477 Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr force-pushed the acc-userdata-unlink branch from 3a31c16 to 869ffad Compare November 18, 2025 14:48

boring-cyborg bot added component:backup component:kubernetes component:vmware labels Nov 18, 2025

shwstppr changed the base branch from main to 4.20 November 18, 2025 14:48

shwstppr changed the title ~~server,engine-schema: unlink userdata during acount cleanup~~ server,engine-schema: add check for account userdata cleanup Nov 18, 2025

github-actions bot removed the status:has-conflicts label Nov 19, 2025

shwstppr removed the component:vmware label Nov 28, 2025

shwstppr removed component:kubernetes component:backup labels Nov 28, 2025

rajujith added this to Apache CloudStack 4.22.1 Jan 5, 2026

rajujith moved this to In Progress in Apache CloudStack 4.22.1 Jan 7, 2026

shwstppr added 2 commits January 7, 2026 13:37

Merge branch '4.20' into acc-userdata-unlink

e80e892

fix and tests

f384872

Signed-off-by: Abhishek Kumar <[email protected]>

apache deleted a comment from blueorangutan Jan 7, 2026

shwstppr modified the milestones: 4.22.1, 4.20.3 Jan 7, 2026

shwstppr marked this pull request as ready for review January 7, 2026 11:40

shwstppr requested a review from harikrishna-patnala January 7, 2026 11:40

sureshanaparti removed this from Apache CloudStack 4.22.1 Jan 8, 2026

sureshanaparti added the status:needs-testing label Jan 8, 2026

sureshanaparti reviewed Jan 8, 2026

View reviewed changes

sureshanaparti approved these changes Jan 8, 2026

View reviewed changes

	public List<Long> listByUserdataIdsNotAccount(List<Long> userdataIds, long accountId) {
	public List<Long> listByUserdataIdsNotInAccount(List<Long> userdataIds, long accountId) {

server,engine-schema: add check for account userdata cleanup #11595

Are you sure you want to change the base?

server,engine-schema: add check for account userdata cleanup #11595

Conversation

shwstppr commented Sep 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

codecov bot commented Sep 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

shwstppr commented Sep 9, 2025

Uh oh!

blueorangutan commented Sep 9, 2025

Uh oh!

blueorangutan commented Sep 9, 2025

Uh oh!

harikrishna-patnala left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 11, 2025

Uh oh!

shwstppr commented Sep 11, 2025

Uh oh!

shwstppr commented Nov 20, 2025

Uh oh!

blueorangutan commented Nov 20, 2025

Uh oh!

blueorangutan commented Nov 20, 2025

Uh oh!

shwstppr commented Jan 7, 2026

Uh oh!

shwstppr commented Jan 7, 2026

Uh oh!

blueorangutan commented Jan 7, 2026

Uh oh!

blueorangutan commented Jan 7, 2026

Uh oh!

sureshanaparti Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

shwstppr commented Sep 8, 2025 •

edited

Loading

codecov bot commented Sep 8, 2025 •

edited

Loading